Bitcoin Taproot Upgrade Nailed Down for July, but Some Finer Details Still Aren't Finalized

The finalized code for Taproot will be shipped in March, but will it house the "user activated soft fork" feature that threatened to activate SegWit?